From: Tomasz Miąsko <tomasz.miasko@gmail.com>
Date: Sun, 4 Mar 2018 00:00:00 +0000 (+0000)
Subject: Include C headers in introspection file.
X-Git-Tag: archive/raspbian/3.24.39-1+rpi1~1^2~65^2~37^2~28^2
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=91498c7db34481c9014dd63f235a1679fc4b8bfb;p=gtk%2B3.0.git

Include C headers in introspection file.

Include gtk/gtk.h and gtk/gtk-a11y.h unconditionally,
and gtk/gtkx.h when building with X11. Ensures that
introspection data contains complete set required
headers, which is useful when generating C code based
on introspection data.

Diff for generated gir (when using X11):

```diff
   <include name="xlib" version="2.0"/>
   <package name="gtk+-3.0"/>
+  <c:include name="gtk/gtk-a11y.h"/>
+  <c:include name="gtk/gtk.h"/>
+  <c:include name="gtk/gtkx.h"/>
   <namespace name="Gtk"
              version="3.0"
```

Fixes issue #56.
---

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 63f88e9476..92f6ec734f 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -1594,9 +1594,11 @@ Gtk_3_0_gir_SCANNERFLAGS = 			\
 	--add-include-path=$(top_builddir)/gdk	\
 	--include-uninstalled=$(top_builddir)/gdk/Gdk-3.0.gir
 Gtk_3_0_gir_INCLUDES = Atk-1.0
+Gtk_3_0_gir_C_INCLUDES = gtk/gtk.h gtk/gtk-a11y.h
 if USE_X11
 Gtk_3_0_gir_SCANNERFLAGS += --add-include-path=$(top_builddir)/gdk/x11
 Gtk_3_0_gir_INCLUDES += xlib-2.0
+Gtk_3_0_gir_C_INCLUDES += gtk/gtkx.h
 endif
 Gtk_3_0_gir_CFLAGS = \
 		$(AM_CPPFLAGS) \